bitkeeper revision 1.1159.1.482 (41c08038WE4QP9GDCInODhJX2Xh7xQ)
authorcl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Wed, 15 Dec 2004 18:19:36 +0000 (18:19 +0000)
committercl349@arcadians.cl.cam.ac.uk <cl349@arcadians.cl.cam.ac.uk>
Wed, 15 Dec 2004 18:19:36 +0000 (18:19 +0000)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen.bk-smp


Trivial merge